Fix entity counts drifting above reality#273
Merged
Merged
Conversation
Member
|
Thanks! |
This was referenced Jul 5, 2026
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes persistent entity count drift where limits would show more mobs
than actually existed on the island. After a recount (/calc) the real
(lower) count would appear.
Changes
entityIslandMap + EntityAddToWorldEvent
Maps entity UUID to island ID so decrement always targets the correct
island, even when the entity wanders off-island before dying. The map
was transient — lost on every restart. An EntityAddToWorldEvent handler
now repopulates it when chunks load. A justPortaled debounce list
prevents double-decrement if EntityRemoveEvent fires for the
source-world removal during a portal teleport.
Entity change persistence
incrementEntity/decrementEntity called setChanged() but never triggered
a save — only block changes called updateSaveMap. Entity-only changes
were only persisted on onDisable(). Added markChanged() on
BlockLimitsListener so entity changes join the batch-save cycle
(every 10 changes), ensuring counts survive restarts even without
block activity on the island.
Testing
132 tests pass across EntityLimitListenerTest, BlockLimitsListenerTest,
JoinListenerTest, PaperShulkerLimitListenerTest, and others.